t / t4135 / diff-with tab.diffon commit Merge branch 'aw/rebase-i-stop-on-failure-to-amend' into maint (d9d73b3)
   1--- post        image.txt.orig  2010-08-18 20:13:31.616002255 -0500
   2+++ post        image.txt       2010-08-18 20:13:31.616002255 -0500
   3@@ -1 +1 @@
   4-preimage
   5+postimage